do not use a root password for local dev

Andrew Cantino 11 年 前
コミット
95994eb1b4
共有2 個のファイルを変更した2 個の追加3 個の削除を含む
  1. 0 1
      .travis.yml
  2. 2 2
      config/database.yml

+ 0 - 1
.travis.yml

@@ -2,7 +2,6 @@ language: ruby
2 2
 bundler_args: --without development production
3 3
 rvm:
4 4
   - 1.9.3
5
-  - jruby-19mode # JRuby in 1.9 mode
6 5
 before_script:
7 6
   - mysql -e 'create database huginn_test;'
8 7
 script: "bundle exec rake"

+ 2 - 2
config/database.yml

@@ -2,7 +2,7 @@ development:
2 2
   adapter: mysql2
3 3
   database: huginn_development
4 4
   username: root
5
-  password: password
5
+  password:
6 6
   socket: <%= ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
7 7
   encoding: utf8
8 8
   reconnect: true
@@ -15,7 +15,7 @@ test:
15 15
   adapter: mysql2
16 16
   database: huginn_test
17 17
   username: root
18
-  password: password
18
+  password:
19 19
   socket: <%= ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
20 20
   encoding: utf8
21 21
   reconnect: true